css: Pass the real context to the CSS lookup

This will be necessary soon.

diff --git a/gtk/gtkcsslookup.c b/gtk/gtkcsslookup.c
index c3e6a7316f3c9da055d500107d0c03b07bba5a95..dc43005287595efa29e29ec3f37a50f1b2e3bc13 100644 (file)
--- a/gtk/gtkcsslookup.c
+++ b/gtk/gtkcsslookup.c
@@ -106,8 +106,7 @@ _gtk_css_lookup_set (GtkCssLookup  *lookup,
 /**
  * _gtk_css_lookup_resolve:
  * @lookup: the lookup
- * @parent: the parent properties to look up inherited values from or %NULL
- *     if none
+ * @context: the context the values are resolved for
  *
  * Resolves the current lookup into a styleproperties object. This is done
  * by converting from the "winning declaration" to the "computed value".
@@ -119,14 +118,16 @@ _gtk_css_lookup_set (GtkCssLookup  *lookup,
  **/
 GtkStyleProperties *
 _gtk_css_lookup_resolve (GtkCssLookup    *lookup,
-                         GtkStyleContext *parent)
+                         GtkStyleContext *context)
 {
   GtkStyleProperties *props;
+  GtkStyleContext *parent;
   guint i, n;
 
   g_return_val_if_fail (lookup != NULL, NULL);
-  g_return_val_if_fail (parent == NULL || GTK_IS_STYLE_CONTEXT (parent), NULL);
+  g_return_val_if_fail (GTK_IS_STYLE_CONTEXT (context), NULL);
 
+  parent = gtk_style_context_get_parent (context);
   n = _gtk_css_style_property_get_n_properties ();
   props = gtk_style_properties_new ();
 

diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
index bbcdc2a5935ead372d2421d81e8ab571284b120d..bda25e05a66611577fe7489361ee1f603ff9a498 100644 (file)
--- a/gtk/gtkstylecontext.c
+++ b/gtk/gtkstylecontext.c
@@ -987,7 +987,7 @@ build_properties (GtkStyleContext *context,
         }
     }
 
-  style_data->store = _gtk_css_lookup_resolve (lookup, priv->parent);
+  style_data->store = _gtk_css_lookup_resolve (lookup, context);
   _gtk_style_properties_set_color_lookup_func (style_data->store,
                                                gtk_style_context_color_lookup_func,
                                                context);